bitkeeper revision 1.1159.170.87 (41e403a3b9YzrwLBMzUP1m_iQQGMJQ)

Allow building of kernels with no module support.

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index bb7bf57ec4284c69d92642cb08d27b16a0b69f6d..82179c6c745106b4bc43c6b39cf13ad9ee044547 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -11,12 +11,14 @@ include buildconfigs/Rules.mk
 
 .PHONY: build clean delete
 
+# The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+       if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
+           $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
+           $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
+       fi
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
-# The real action starts here!
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al $< $(LINUX_DIR)

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 3f3b84b2ded9f9386a2d452600b95cbe733797b6..fa6e1109b3d20fbaee6c2a741fa00a483fac65bc 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -13,11 +13,12 @@ include buildconfigs/Rules.mk
 
 # The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
-       $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
+       if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
+           $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
+           $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
+       fi
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
-
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al $< $(LINUX_DIR)